Gate tests with the right edition #147498

pvdrz · 2025-10-08T21:29:42Z

This PR guarantees that ./x test --test-args="--edition XXXX" ui runs correctly with the 2015, 2018 and 2021 editions.

I don't expect this PR to hold up over time but it helps to submit further updates to the //@ edition directives of tests where we can use the new range syntax to have a more robust testing across different editions

r? @fmease

try-job: aarch64-gnu
try-job: aarch64-apple
try-job: x86_64-msvc-1
try-job: i686-msvc-1
try-job: x86_64-mingw-1
try-job: test-various
try-job: armhf-gnu

jieyouxu · 2025-10-09T00:20:19Z

I'll nominate this for compiler team discussion re. "we accepted the MCP for the direction in theory, here's the actual shape of the implementation" for a quick vibecheck. If team is onboard, we'll coordinate to bump the priority of this PR w.r.t. merge conflict potential.

fmease · 2025-10-09T00:42:31Z

If team is onboard, we'll coordinate to bump the priority of this PR w.r.t. merge conflict potential.

We can do so already proactively:

@bors rollup=never p=20 (bitrot-prone, prone to conflicts in the queue; ref)

tests/ui/asm/naked-invalid-attr.rs

jieyouxu · 2025-10-09T14:45:02Z

Discussed in today's compiler triage meeting #t-compiler/meetings > [weekly] 2025-10-09 @ 💬, no objections to current direction.

I'll set aside sometime this weekend and/or next weekend to do a review pass.

jieyouxu · 2025-10-10T11:59:06Z

@bors try

Gate tests with the right edition try-job: aarch64-gnu try-job: aarch64-apple try-job: x86_64-msvc-1 try-job: i686-msvc-1 try-job: x86_64-mingw-1 try-job: test-various try-job: armhf-gnu

rust-bors · 2025-10-10T13:28:15Z

💔 Test for 058257d failed: CI. Failed jobs:

try - aarch64-gnu (web logs, extended logs)

fmease · 2025-10-13T12:00:57Z

The root cause(s) of #147556 have been mitigated IIUC (by temporary means or why is it still open?). Thus I'll try again

@bors try

Gate tests with the right edition try-job: aarch64-gnu try-job: aarch64-apple try-job: x86_64-msvc-1 try-job: i686-msvc-1 try-job: x86_64-mingw-1 try-job: test-various try-job: armhf-gnu

rust-bors · 2025-10-13T15:08:19Z

☀️ Try build successful (CI)
Build commit: 7431b5f (7431b5f61bcdc70e1bf990a84b252dc96dbd4a60, parent: 35456985fab3419baf4bf111b8bbbd5e8565615d)

bors · 2025-10-19T04:55:01Z

☔ The latest upstream changes (presumably #147863) made this pull request unmergeable. Please resolve the merge conflicts.

jieyouxu · 2025-10-20T11:38:31Z

Didn't have time last weekend, I blocked out time for a review pass for this Friday/Saturday.

bors · 2025-10-22T21:00:13Z

☔ The latest upstream changes (presumably #147207) made this pull request unmergeable. Please resolve the merge conflicts.

fmease · 2025-10-22T22:00:49Z

Thanks for your patience btw, as for me, I'll review this tomorrow at the latest (jieyouxu and I will both review separately).

pvdrz · 2025-10-23T15:21:29Z

No worries, most of the conflicts are can be fixed by blessing so we're good

jieyouxu

(Remark for myself: commit 1 looks OK)

View changes since this review

tests/ui/hashmap/hashmap-memory.rs

tests/ui/parallel-rustc/unexpected-type-issue-120601.stderr

jieyouxu

Mostly looks good, a few unexpected things

View changes since this review

tests/ui/argument-suggestions/extra_arguments.rs

tests/ui/closures/closure-clone-requires-captured-clone.stderr

tests/ui/impl-trait/call_method_on_inherent_impl_on_rigid_type.rs

tests/ui/impl-trait/generic-with-implicit-hrtb-without-dyn.rs

tests/ui/impl-trait/method/would-constrain-opaque.rs

tests/ui/or-patterns/binding-typo-2.rs

jieyouxu · 2025-10-28T11:54:29Z

tests/ui/parallel-rustc/unexpected-type-issue-120601.stderr

   |
 LL |     Unstable2(())
   |     ^^^^^^^^^ not found in this scope

 error[E0308]: mismatched types
-  --> $DIR/unexpected-type-issue-120601.rs:22:9


Remark: wait hang on, I knew this diff was fishy. What happened to the file paths or line numbers? I don't think it's with this PR, there's a diagnostics emitter bug or sth here, or maybe with compiletest's rendering of the diagnostics somehow?

EDIT: oh wait, this is compare output by lines. Still feels a bit surprising 🤔

I just blessed stuff 🤣. I can rebase the PR on top of a newer commit if that would help.

jieyouxu

This looks good based on the review passes I've done. Waiting for another pair of eyes on the diffs to double-check.

View changes since this review

rustbot · 2025-11-04T20:35:55Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

This comment was marked as resolved.

Sign in to view

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 8, 2025

rustbot assigned fmease Oct 8, 2025

This comment was marked as off-topic.

Sign in to view

This comment has been minimized.

Sign in to view

jieyouxu self-assigned this Oct 9, 2025

jieyouxu added the I-compiler-nominated Nominated for discussion during a compiler team meeting. label Oct 9, 2025

fmease added the S-waiting-on-t-compiler Status: Awaiting decision from T-compiler label Oct 9, 2025

fmease reviewed Oct 9, 2025

View reviewed changes

tests/ui/asm/naked-invalid-attr.rs Show resolved Hide resolved

jieyouxu removed I-compiler-nominated Nominated for discussion during a compiler team meeting. S-waiting-on-t-compiler Status: Awaiting decision from T-compiler labels Oct 9, 2025

pvdrz force-pushed the pvdrz/edition-range-gating branch from 5a3a9a0 to 6e1b054 Compare October 9, 2025 23:01

This comment has been minimized.

Sign in to view

jieyouxu mentioned this pull request Oct 10, 2025

libffi build error on aarch64-gnu-debug: unsupported option '-print-multi-os-directory' #147556

Closed

This comment has been minimized.

Sign in to view

pvdrz mentioned this pull request Oct 14, 2025

Tracking issue for MCP 861: Make the UI test suite more amenable to multiple editions #145364

Open

2 tasks

pvdrz force-pushed the pvdrz/edition-range-gating branch from 6e1b054 to c6339ea Compare October 20, 2025 02:49

This comment has been minimized.

Sign in to view

pvdrz force-pushed the pvdrz/edition-range-gating branch from c6339ea to 2019c91 Compare October 22, 2025 21:57

This comment has been minimized.

Sign in to view

jieyouxu self-requested a review October 26, 2025 09:10

jieyouxu reviewed Oct 26, 2025

View reviewed changes

tests/ui/hashmap/hashmap-memory.rs Show resolved Hide resolved

tests/ui/parallel-rustc/unexpected-type-issue-120601.stderr Show resolved Hide resolved

jieyouxu requested changes Oct 26, 2025

View reviewed changes

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 26, 2025

pvdrz force-pushed the pvdrz/edition-range-gating branch from 2019c91 to 8efb800 Compare October 27, 2025 16:40

pvdrz requested a review from jieyouxu October 27, 2025 16:40

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 27, 2025

jieyouxu reviewed Oct 28, 2025

View reviewed changes

jieyouxu mentioned this pull request Oct 29, 2025

Parallel rustc + compare-output-by-lines + edition 2015 loses diagnostic file path / line number in stderr snapshot #148235

Open

jieyouxu approved these changes Oct 29, 2025

View reviewed changes

pvdrz added 2 commits November 4, 2025 15:09

Gate 2015 UI tests

700d6c4

Gate 2018 UI tests

605fc52

pvdrz force-pushed the pvdrz/edition-range-gating branch from 8efb800 to 605fc52 Compare November 4, 2025 20:35

Gate tests with the right edition #147498

Are you sure you want to change the base?

Gate tests with the right edition #147498

Conversation

pvdrz commented Oct 8, 2025 • edited by jieyouxu Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as resolved.

This comment was marked as off-topic.

This comment has been minimized.

jieyouxu commented Oct 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

fmease commented Oct 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

jieyouxu commented Oct 9, 2025

Uh oh!

jieyouxu commented Oct 10, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

rust-bors bot commented Oct 10, 2025

Uh oh!

fmease commented Oct 13, 2025

Uh oh!

This comment has been minimized.

rust-bors bot commented Oct 13, 2025

Uh oh!

bors commented Oct 19, 2025

Uh oh!

This comment has been minimized.

jieyouxu commented Oct 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Oct 22, 2025

Uh oh!

This comment has been minimized.

fmease commented Oct 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pvdrz commented Oct 23, 2025

Uh oh!

jieyouxu left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jieyouxu left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jieyouxu Oct 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pvdrz Oct 28, 2025

Choose a reason for hiding this comment

Uh oh!

jieyouxu Oct 29, 2025

Choose a reason for hiding this comment

Uh oh!

jieyouxu left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rustbot commented Nov 4, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

pvdrz commented Oct 8, 2025 •

edited by jieyouxu

Loading

jieyouxu commented Oct 9, 2025 •

edited

Loading

fmease commented Oct 9, 2025 •

edited

Loading

jieyouxu commented Oct 20, 2025 •

edited

Loading

fmease commented Oct 22, 2025 •

edited

Loading

jieyouxu left a comment •

edited by rustbot

Loading

jieyouxu left a comment •

edited by rustbot

Loading

jieyouxu Oct 28, 2025 •

edited

Loading

jieyouxu left a comment •

edited

Loading